More cleanup of stupid stuff

Cleaner handling of Vector of Users. No more Vector of Vector of User
Merge branch 'master' of https://github.com/JackBracken/FYP