Merge branch 'master' of git://github.com/dmorse/simpatico

Conflicts:
	.gitignore
Merge upstream master
merge with origin master