Merge branch 'master' of github.com:jfcamel/dotemacs

Conflicts:
	.travis.yml
Merge branch 'master' of github.com:jfcamel/dotemacs

Conflicts:
	.travis.yml