We differ from master only in this file. Needed to get travis to build us in an osx vm
added missing ci-osx.sh file
[skip ci]
set executable on ci-osx.sh
Merge branch 'master' into travis-osx
Merge branch 'master' into travis-osx

Conflicts:
	.travis.yml
remove notification[skip ci]
merge with master for CI on osx
merge with master for CI on osx
merge with master for CI on osx
merge with master for CI on osx
merge with master for CI on osx
ci-osx.sh imported from travis branch
Merge branch 'travis-osx' into fix-travis-branch
remove graphviz dep from readme
Make git log cleaner by using push for travis-osx
We worked around difference between our travis-osx helper branch and master by using merge -s ours on travis-osx so they both think they are up to date with each other
Revert "Make git log cleaner by using push for travis-osx"

This reverts commit 9e115583ff5aad654a3d1108d4607b1fe2907a9e.
use cmake 2.8.12.2 by ensuring its path is first
try to get travis to use my cmake
$TMPDIR is gone. use /tmp
don't quote and escape spaces