Make phantomjs the default selenium driver
Reintegrate live tests into normal test run
Upgrade to selenium 2.29.0
Include requirements.txt properly into terrarium
Revert "Include requirements.txt properly into terrarium"

terrarium doesn't support -r style includes yet.

This reverts commit 308ec6c89e16652837f7f63dd3f204065ea6d341.
Merge branch 'master' into phantomjs-tests
Run phantomjs before install in the background on default port
Add debug info in travis build
Add debug level output for terrarium
Upgrade to terrarium master
Update to Django 1.4.4
Merge branch 'phantomjs-tests'