Adding name to the VM in virtualbox
Changes for configs to be less confusing:

 - renaming flask_defaults example config
 - moving custom_theme_image.py into base.py
 - creating base.py.example
Upgrade jquery from 2.0.3 to 2.1.1
Simple filter for codenames on journalist interface
Do not delete invisible collections, even if they are checked!
Fixes issue #377, where a source cannot generate a new codename if their
collection is deleted by the journalist while they are still logged in.
Redirect to the proper URL for endpoints which require login
Merge pull request #373 from Hainish/vagrant-name-vbox

Adding name to the VM in virtualbox
Recommending use of base64 encoded random bits for scrypt peppers
Merge pull request #375 from Hainish/upgrade-jquery

Upgrade jquery from 2.0.3 to 2.1.1
set DISPLAY without breaking everything
Merge branch 'fix/broken-travis-tests-2' into develop
Merge pull request #374 from Hainish/config-naming-clarity

Changes for configs to be less confusing:
selenium should be unversioned to get the latest selenium, since we're apt-get installing the latest firefox
Merge pull request #378 from Hainish/issues/377

Fixes issue #377, where a source cannot generate a new codename if their
Case insensitivity for filter codenames
Merge pull request #376 from Hainish/issues/370

Issues/370
Merging master into issues/371