init
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.gitignore
	bashrc
	bundle/vim-snippets/snippets/eruby.snippets
	bundle/vim-snippets/snippets/ruby.snippets
	gitconfig
	vimrc
	zshrc