Added automatic screen opening with terminal
Merge branch 'master' of github.com:cshinaver/dotfiles

Conflicts:
	zshrc