Update README
Merge branch 'master' into the_now_habit

Keep open branches up to date with master.