Test refactoring and some added functionality.
Merge branch 'master' of github.com:yankyn/puyol

Conflicts:
	src/puyol/orm/orm.py