updated aliases file
Merge branch 'master' of http://github.com/Unknown-Anomaly/dotfiles

Not synced files across development machines
Merge branch 'master' of http://github.com/Unknown-Anomaly/dotfiles

overlapping commit
updated desktop conky