Potential Fix for #194

Reverted a code change
Fixed #223

Removed the "Your name is..." line
Potential fix for #193
Better fix for #193

Now fixes the problem with unassigning as well
Merge pull request #232 from VanessaHenderson/master

Merging in changes
Merge pull request #233 from nikosphillips/master

Multiple fixes
Merge branch 'master' of git://github.com/AUTUpStageTeam/UpStage2013