Some updated stuff having to do with admin and such
Merge branch 'master' of git://github.com/NatElkins/iHava