edits from peter
Merge branch 'JohnBlog' of github.com:OnePageCRM/OnePageCRM.github.io into JohnBlog
edits from peter