Running chmod on the script for travis
Merge branch 'master' of github.com:tyrbo/tunefish
Adjusted test.sh so it should hopefully create the test database.
Added Rakefile deployments
Removed merge conflict straggler from activities page. Fixed landing page so it opens to the proper address based on environment.
Added hard Rails deployments to Rakefile
Removed unnecessary joins from deployment tasks
Cleaning up the Rakefile deployment a little bit
Merge branch 'master' of https://github.com/tyrbo/tunefish into user_subs
merge conflict resolution