cleaned up all the rspec tests so that none are failing anymore
Merge branch 'authentication_tests' into dev
updated the rakefile to include the task to push to my ec2-test instance as well as the other amazon instance while I evaluate the two options, also updated the password in deploy.rb
added cap deploy task to rakefile
Merge branch 'add_rake_tasks' into dev