style changes
updated readme instructions
Merge branch 'master' into gh-pages