Use more informative names
Update Travis CI config
Merge branch 'build.dirs'