update readme to refer to wiki
Merge branch 'develop'