windows fixes
make bashrc work on Windows
consolidate useful functions into shortcuts.sh
Merge branch 'master' of https://github.com/jschaf/dotfiles

Conflicts:
	.bashrc
	.shell-common.sh
change eol to lf