adding macosx branch, only .travis.yml differs
Merge branch 'master' into macosx
changing macosx branch README.md travis status image to point to macosx branch
Merge branch 'master' into macosx

Conflicts:
	README.md
Merge branch 'master' into macosx

Conflicts:
	README.md
Merge branch 'master' into macosx
Merge branch 'master' into macosx
Merge branch 'master' into macosx
fixing yet another stuid merge mistake
fixing mistaken merge
Merge branch 'dev'
Merge branch 'dev'