add travis configs
Merge branch 'master' into travis-update

Conflicts:
	Gemfile
update gem
add rake to gemfile
remove before install
put back gem updates
remove dep rake
add rakefile
Revert "remove dep rake"

This reverts commit 326a067ac57403af4f424e77dc8146a2b7204aa0.
Merge branch 'travis-update' into develop