Add Travis CI config
Bump GHC version for Travis CI
Merge branch 'lol'

Conflicts:
	.travis.yml