* add .travis.yml
Merge branch 'master' into develop

* master:
  Add initial features after storyboarding w stakeholders
  * switch from passenger to puma as app server
  * fix cleanup task/sudo interaction (known issue with cap 2.x)
  * remove resque rake task
* merge master
Merge branch 'master' into develop

* master:
  * fix .travis.yml

Conflicts:
	.travis.yml
Merge branch 'master' into develop

* master:
  * add develop to branches tracked by travis ci
Merge branch 'master' into develop

* master:
  * more .travis.yml tweaks

Conflicts:
	.travis.yml
Merge branch 'master' into develop

* master:
  * remove development group from travis bundle
* tweak Guardfile
* remove livereload block from Guardfile
* fix Guardfile
* fix broken feature specs by requiring spec_helper
* add activities (migration, schema, model)
* add ActivityError lib file
* add activity model spec
Merge branch 'feature/activities' into develop
Test tweaks
* update/fix running scope on Tasks
* implement a few of the model specs
Merge branch 'feature/add-tasks' into develop
* update gem versions in lock file
* uncomment livereload section in guardfile
* remove launchy component of rspec section of guard file
Merge branch 'feature/tweaks' into develop