putting test photos back
added test data
had wrong test command in travis file
fixed test
making travis run
named travis test config db
updated requirements
Merge branch 'config'

;q
working on fabfile
changes to fab file
deploy successfully installing software
deploy successfully installing software
fixed nginx upload_template problem
Merge branch 'deploy' into views

;q
fixed bug where env vars trying to be loaded at runtime from settings.py
Merge branch 'deploy' into views

;q