Update .aliases

new alias
Merge remote-tracking branch 'upstream/master'
new date on push
Merge branch 'master' of github.com:gnomeye/dotfiles_scarab
output fix
Update .functs

revert
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xmonad/xmonad.hs
Merge remote-tracking branch 'upstream/master'
new aliases - new shortcuts
Merge remote-tracking branch 'upstream/master'
new chromium AlternativeBrowser