even moar reformats
updated with changes from mac-support branch
Merge branch 'master' into mac-support

Conflicts:
	README.md