moving portions of readme to wiki
readme
Merge branch 'master' into gh-pages