symlink UltiSnips snippets
Merge branch 'master' of https://github.com/nwallace/dotfiles

Conflicts:
	new_box.sh
more git aliases, vim shortcut to application controller, extend erb snippets
support both chruby and rvm