Travis gem
Merge branch 'master' of github.com:bripkens/dotfiles

Conflicts:
	atom/config.cson