[#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
[#666] Fix group/org facet titles
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
Merge branch 'master' into 356-auth-create-user-option
[#356] Change the valiation message
[#356] Functional API tests

* Remove the old commented functional tests testing against the
  templates.
* New tests that test against the API.