installation updated
Makevars and tidy
Merge branch 'master' of https://github.com/mdsumner/roc

Conflicts:
	README.md