Cleaning up some things
Merge branch 'master' into dev
Some more README tweaks