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
[#76] Downgrading simplecov due to rspec/capybara/etc issues under Ruby2
Merge branch 'master' into sample_data_73

Conflicts:
	Gemfile.lock
	config/database.travis.yml
[Finishes #76] Massaging time zones so specs can pass.

Expectation is that all times are PST (or whatever the rails app is
configured for) as of right now. Code to adjust time zones in the view
and controller has been disabled (view change only) as its effects were
not accounted for fully.
Merge pull request #74 from TimePulse/sample_data_73

Sample data 73
Merge pull request #77 from TimePulse/travis_failures_76

Travis failures 76
Merge pull request #78 from TimePulse/recent_work_69

[Finishes #69] Cleaning up Recent Work module spacing
Merge branch 'master' into recent_work_70