Merge branch 'master', remote-tracking branch 'origin'
added section to yaml for custom hostnames
a bit of prep-work for adding caching
added code to persist directories between builds. see issue #147