Refactored allow empty
Expanded test
Merge remote branch 'origin/master' into refactored_allow_empty

Conflicts:
	ContentAwareFactory.php
Fixedup test
Merge pull request #68 from dantleech/refactored_allow_empty

[WIP] Refactored allow empty