Merge branch '2.x'

* 2.x:
  Fix Travis CI failures on virtualbox
  (maint) Add Travis CI support to active branches
  Whitespace only reflow of README

Conflicts:
	.gitignore
	.travis.yml