fix gitmodules
Updates and new modules.
Use simple push style in git
Show battery status in tmux
Update vim-coffee-script
New colors! And new js, cofeescript filetypes.
Re-add plugins, aliases, Ruby GC...
Link zsh configs, install oh-my-zsh in install script.
Merge upstream.
Merge branch 'master' of github.com:sandyw/.dotfiles

Fixed Conflicts:
	.vimrc
	.zshrc
Update base16-vim