Added nosetest alias
Merge branch 'master' of github.com:paralleldanielle/dotfiles

Conflicts:
	zsh/.zshrc