setup now with user stuff
Merge branch 'master' of github.com:swirepe/personalscripts