ghc calc funct
Merge remote-tracking branch 'upstream/master'
Update .xmobar/conkyrc-xmobar

show pacman status only if updates available
Merge remote-tracking branch 'upstream/master'
modified, new vimrc/pathogen
mplayer errors out
added mailcap
changed to mpg123
update