Merge branch 'master' of https://github.com/m0smith/topoged

Conflicts:
	.gitignore