Updates to models to remove TimeAwayType
Merge branch 'master' of http://github.com/excellaco/collab-schedule

Conflicts:
	schedule/models.py