Removed irssi saved colors
Added CCACHE exports to bashrc
Update vimrc to better match android style guides
Merge branch 'master' of github.com:mdwrigh2/dotfiles

Conflicts:
	vimrc
Updated git branch parsing to match latest git