Add a note about the global nature of current working directory
Use git checkout to ensure no modified files
Merge branch 'master' of https://github.com/ndmitchell/extra

Conflicts:
	travis.hs