Include annotations in bundle search results.

Include annotations in bundle search results.

The previous attempt at this problem was flawed in that API call for
getting bundles directly pulls from Mongo while search?text= and
search/interesting get results from ElasticSearch.

QA:

Load up some bundles with annotations:

bin/ingest-queued --prefix="~charmers/charms/precise/ntp"
bin/ingest-queued --prefix="~bac"

Change juju-gui to point to locally running charmworld:

diff --git a/app/config-debug.js b/app/config-debug.js
index 39daca6..f2c86b6 100644
--- a/app/config-debug.js
+++ b/app/config-debug.js
@@ -32,7 +32,10 @@ var juju_config = {
   // These are the main application config items used and passed down into all
   // SubApps.
   consoleEnabled: true,
+  //charmworldURL: 'https://manage.jujucharms.com/',
+  charmworldURL: 'http://127.0.0.1:2464/',

Run charmworld and juju-gui.  In the GUI wait for the initial results to
load.  These are the Featured charms and bundles.

Select the rails-scalable bundle.  Note the layout in the inspector.  Close
the inspector and then drag the bundle (using the name not the icon) to the
canvas.  Note that the layout is the same as the preview.

https://code.launchpad.net/~bac/charmworld/annotation-dos/+merge/218520

(do not edit description out of merge proposal)

[bac, 2014-05-06 22:03:39]

Please take a look.

[j.c.sackett, 2014-05-07 13:14:14]

LGTM, with one minor improvement/question.

https://codereview.appspot.com/91140045/diff/1/charmworld/views/tests/test_ap...
File charmworld/views/tests/test_api.py (right):

https://codereview.appspot.com/91140045/diff/1/charmworld/views/tests/test_ap...
charmworld/views/tests/test_api.py:1786: services['charm'].update(extra_data)
Is there any reason to not just declare services with annotations already in
charm, rather than calling update on it?

https://codereview.appspot.com/91140045/diff/1/charmworld/views/tests/test_ap...
charmworld/views/tests/test_api.py:1821: services['charm'].update(extra_data)
Same question as above.