for ubuntu, libboost-dev, not libboost-all-dev
adding git config stuff to .travis/after_success
adding git config stuff to .travis/after_success.sh
improved travis mocking, better mock diagnostics
hardcoding git config user name and email
travis no like cat
adding _merge.sh trying automated merge
manual merge, master into macosx