Updated listchars in .vimrc
Merge branch 'master' of github.com:mpenkov/dotfiles
not using fluxbox anymore
Not using TuxCmd anymore
Updated .muttrc
Merge branch 'osx' of github.com:mpenkov/dotfiles

Conflicts:
	.vimrc
Adding some aliases from DAS

https://github.com/garybernhardt/dotfiles/blob/master/.gitconfig
Replacing tabs with spaces.
Stolen from DAS.

https://github.com/garybernhardt/dotfiles/blob/master/.githelpers
Merge remote-tracking branch 'origin' into osx

Committing everything except Ubuntu-specific changes to .bashrc and .bash_aliases
Be more strict with flake8
indentation for ruby files
Automatically highlight 80th column in vim.