Travis OS X support
Merge branch 'master' of github.com:flowgrind/flowgrind into up-master