forgot to push these
Merge branch 'master' of github.com:yuethomas/fuel
merge

Conflicts:
	fuel/models.py