Merge branches 'master' and 'master' of github.com:toddhainsworth/eve

Conflicts:
	README.rdoc
Merge branches 'master' and 'master' of github.com:toddhainsworth/eve