Update bash and vim config files
Add gitconfig file
Fix export in bashrc

Add terminal color settings
Some vim settings
vimrc: Add Vundle plugin
Merge branch 'master' of github.com:RomainGiraud/defix

Conflicts:
	.vimrc
gitconfig: add alias mergetool
Merge branch 'master' of github.com:RomainGiraud/defix
Add tmux conf

+ Color in xfce4-terminal
Merge branch 'master' of github.com:RomainGiraud/defix
Modify xfce4-terminal size
Add color to bash (Base16 default)
Enable 256 colors in vim
Configure shortcuts in tmux
Remove tmux from bashrc
Add windows swap
Git: auto-rebase
Add lots of stuff based on Git ProTips keynote
Refactor tmux.conf
git: add branch alias