Reformatting and adding to the README.
Merge branch 'dev'