Merge pull request #1 from 18F/devel

update
Merge pull request #2 from 18F/devel

Pull test #2
Create codeship.database.yml
Merge branch 'devel' of github.com:18F/myusa into devel
New Relic for Rails & Capistrano
Added capture_params for development & staging
Merge branch 'devel' of github.com:18F/myusa into devel
Testing Snap CI
Merge branch 'devel' into feature/newrelic

Conflicts:
	Gemfile
Merge pull request #306 from 18F/feature/newrelic

New Relic for Rails & Capistrano
Merge branch 'devel' of github.com:18F/myusa into devel
Merge branch 'devel' into hotfix/better_factory_usage