Further tweaks to the models
Merge branch 'master' of timcgithub:timcmartin/ticketstub into 3_creating_controllers