Scripts/ -> bin/

I still need to fix up some paths/aliases
Merge branch 'master' of github.com:jdavis/dotfiles

Conflicts:
	bin/git-calendar