Update gitconfig and bashrc
Merge branch 'master' of https://github.com/dfq/.df
Update vimrc, bashrc
Updates from work machine
Updates from work machine
Updates from work machine
Update submodules
(Finally!) update PS1, make it readable and manageable
Merge branch 'master' into git-1.7.9

Conflicts:
	gitconfig
	vim/bundle/syntastic
	vim/bundle/vim-fugitive