Miscellaneous changes since 2011, keeping commit just before
Merge branch 'master' of github.com:quadrismegistus/prosodic

Conflicts:
	.DS_Store