Disable folding in vim
Add Ruby indentation
Use gvim for git diff
RVM added to path
Updated local gitignore
Added zshrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore