Consolidated setup instructions into README.md
Merge branch 'dev'