Latest commits. I have no idea what these re bc been away too long.
Merge branch 'master' of https://github.com/aconduit/aConduit

Conflicts:
	.gitignore