Add github user name
Merge branch 'master' of http://github.com/ushu/dotfiles

Conflicts:
	.gitconfig
NeoBundle update
Fix zsh
Move Rails template to dotfiles