Various fixes (forgot to commit at different stages :P)
Merge branch 'app' of github.com:wbbaddons/Tims-Chat into app