Final migration of working tests.
Merge branch 'master' of github.com:climbapp/climb

Conflicts:
	db/schema.rb