Merge branch 'master' of git://github.com/Shoofly/shoofly

Conflicts:
	src/Base/Base.php
Merge branch 'master' of git://github.com/Shoofly/shoofly