make sure packages are installed
Merge branch 'master' of github.com:JustinAzoff/dotfiles
basic screenrc
fix
fix statusline
make sure packages are installed
basic screenrc
fix
merge
Merge branch 'new_branch_name'

Conflicts:
	vim/vimrc.minimal