Merge pull request #307 from wardi/master

new options: portal-update --push-apikey/--mirror, dump-datasets/load-datasets --gzip
move all facet descriptions to one extension, because of ckan initialization funkiness
method for querying activities by user
Merge pull request #308 from pjakobsen/master

Change to custom API in logic.py
Menu updates
Merge pull request #309 from thriuin/master

Minor menu updates
a template for exposing the newly combined published/pending facets
templating for listing the two publish/pending facets to appear as one
don't show publish/pending facet unless there are results
Merge branch 'master' of git://github.com/open-data/ckanext-canada
build solr index so as to properly return counts for the publish facets
Merge pull request #310 from deniszgonjanin/master

published/pending facet, v1
show apostrophe in list of valid symbols for our tags error message
fix for after_search failing on already-converted results