Fix seeds so that it works on a fresh migration.
Merged master into this branche
[Finishes #73] Cleaning, filling, and testing sample_data tasks

Activities are pending as they may change in the near future. Also
switched to WebMock.
Merge branch 'master' into sample_data_73
Travis fix
Fixing spec_spec
Fixing issues with spec suite
Merge branch 'master' into sample_data_73

Conflicts:
	Gemfile.lock
	config/database.travis.yml
Merge pull request #74 from TimePulse/sample_data_73

Sample data 73