add 'sc' alias
Merge branch 'master' of github.com:jldailey/dotfiles

Conflicts:
	.zshrc
...
Merge branch 'master' of github.com:jldailey/dotfiles

Conflicts:
	.vim/bundle/vim-coffee-script
	.zshrc
latest commits