Merge branch 'dev'
Move tests around to match the directory structure of Rails 4 tests (fix #161)
Merge branch 'master' into dev
You can now update a profile
Updated config/database.yml to work on older versions of psql.
Updated Gemfile, removed foreman, procfile
Removed procfile
Revert "Updated Gemfile, removed foreman, procfile"

This reverts commit c84231abe0b1a3681ade548ecc812c464d5a1382.
Gemfile Updates

Removed auto-generated performance test, added rails-perftest and ruby-prof to Gemfile so we can do performance tests later.
remove ruby-prof as it broke our rbx build
Now we know when we break the production environment
Merge branch 'dev' into feature/ui

Conflicts:
	Gemfile.lock
	test/controllers/profiles_controller_test.rb