Update README
Merge branch 'master' into god_is_not_great

This merge isn't really necessary. Just keeping the current branches up to
date with the lastest changes to master.