Merge changes from master

Edited some things online for Travis/Coveralls.