setup instructions #357
re-arrange readme
merge master into dev