Fixed some aliases and added initial service management
Merge branch 'master' of github.com:xstefanox/dotfiles

Merge with upstream