Merge branch 'nick-plovr-from-source'

Conflicts:
	.gitignore
	README.md