Update .travis.yml
Update README.md
Merge remote-tracking branch 'upstream/master' into sbt-0.12

Conflicts:
	README.md