Loads of user changes
Merge branch 'master' of github.com:nkp/hackkings