major setup and readme updates
Merge branch 'dev'