Merged from master
Updating the VIm RC
Changed some things for the desktop
Updating vimrc for both stark and greyjoy to use systemctl instead of regular apache
Merge branch 'stark-linux' of github.com:tlunter/dotfiles into stark-linux