Added code to download phantomjs in setup_ubuntu.sh. Modified functional tests to use downloaded binary. Added hint in test.sh to run tests from vagrant
Added test instructions to HACKING.md
modified .travis.yml to set the PHANTOMJS_BINARY_PATH to 'phantomjs', to use the version on PATH
Including gnupg-securedrop module, fixing security vulnerability with old python-gnupg module while preserving the methods that securedrop needs
fixed phantomjs sed in .travis.yml
updated HACKING.md and moved default phantomjs location to setup_ubuntu.sh
Merge remote-tracking branch 'origin/develop' into auto-dl-phantomjs
Modified functional tests to use phantomjs binary on path, and changed setup_ubuntu.sh to install phantomjs in /usr/local/bin
updated vagrant warning in test.sh
removed PHANTOMJS_BINARY_PATH from config/test.py.example
added umask settings
removed older chmod that aren't needed
fixed document apache log format for combined log
changed ossec global config to use localhost as smtp relay so that it will work with procmail
added write perm in apparmor profiles for error.log~ and access.log~
Merge pull request #300 from dolanjs/permission-fixes

fixed permssions
Merge pull request #290 from jacksingleton/auto-dl-phantomjs

Added phantomjs binary download to setup_ubuntu.sh
Updated vagrant success instructions to match HACKING.md
Update requirements for fixes of gnupg-securedrop
Removing twill from dependencies (causing travis to error out, not using it)
Updating MySQL-python dependency
added defaultcharset to apache global config
charset problem when reply is solved