Pedantic changes.
Merge branch 'master' of github.com:pharpend/eros

Conflicts:
	eros.cabal