updating for clarity
updated readme, moved some stuff to wiki
Merge branch 'feature/readme' into develop