Update user model and delete config from mk2
Merge branch 'master' of http://github.com/Joimer/MK3