[#485] Remove colour padlock from license snippet
[#485] Put back endif
[#430] Add test for packages in vocab list.

From seanh commit 4c917f58e544d42c101964077a684db27caf293a
PEP8
[#430] Fix for packages not appearing in vocabulary_show
Merge remote-tracking branch 'origin/master' into 430-packages-missing-vocabulary-show
[#664] Fix Group selector in dataset forms
[#669] Fix member_list call when given valid group name.

Now returns lists of (id, type, capacity) tuples
where type is a string. Previously, type was a
Python class object which could not always be
serialized to JSON in the API controller.
[#669] PEP8
[#669] Raise NotFound if group is not found in member_list.

Allows a proper error to be generated in the API
controller instead of just giving a 500 error.
[#669] Tidy up imports
[#666] Fix group/org facet titles
Delete the about page (Fixes #539)
Merge branch 'master' of github.com:okfn/ckan into 430-packages-missing-vocabulary-show
Merge branch '430-packages-missing-vocabulary-show'
Merge branch 'master' of github.com:okfn/ckan into 485-monochrome-icons
Merge branch '485-monochrome-icons'
Merge pull request #666 from okfn/666-satanic-org-facets

Org faceting shows org name not title [2.0]
[#683] Remove author for resource page
[#642] Log possible problems with the datastore permission checks instead of raising an exception.
If postgres is set to a language other than english, some strings might not occur in the error message returned from the database. This change makes the checks less strict but in almost all cases, this should not be a problem because the only error raised during executing of the permission check statements are (expected) permission errors.