Cross build on travis, other minor cleanups
Merge remote-tracking branch 'origin/master'