Merge branch 'master' of https://github.com/lbspen/seattle_job_trends

Conflicts:
	.travis.yml
	Gemfile.ci
Merge branch 'master' of https://github.com/lbspen/seattle_job_trends