removing stuff from README, moving to wiki
Merge branch 'master' into develop