let the README be the same throughout
Merge branch 'master' into macosx
still fixing mistaken merge
Merge branch 'master' into macosx
Merge branch 'master' into macosx
Merge branch 'master' into macosx
Merge branch 'master' into macosx
Merge branch 'master' into macosx
merge master into macosx
trying simpler travis configuration