servy updates
Merge branch 'master' of http://github.com/FruitieX/dotfiles