Simplify .travis.yml
Ignore .rspec-local
Merge branch 'travis'

Conflicts:
	.gitignore