using xvfb and firefox to run functional tests
sourcing /etc/profile immediatly in case travis is running everything in one shell
Clean up some confusing and unused method parameters in decrypt
Add a pylintrc to keep the nits at bay
re-enabling functional test, should work with Firefox WebDriver
Merge remote-tracking branch 'origin/develop' into xvfb-firefox
in Tails, you can run securedrop_init twice without breaking anything. (fixes #355)
fancy python simplification of journalist_filename (#349)
DRYed up filename tests, and use raw strings for regex
Merge pull request #357 from jacksingleton/xvfb-firefox

Using Firefox and Xvfb instead of PhantomJS and enabling submit_and_retrieve_file functional test
Merge pull request #359 from micahflee/tails-torrc-fix

tails-torrc-fix
Typos and small rewordings
Merge pull request #363 from tomrittervg/patch-1

Typos and small rewordings
made comment more clear (#349)
Merge pull request #356 from posix4e/crypt_nits

Crypt nits
Merge pull request #349 from micahflee/better-filenames

Better filenames
adding signal handler functional tests to dump traceback. should help debug when they freeze
Merge pull request #364 from jacksingleton/traceback-sighandler

adding signal handler functional tests to dump traceback
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