changed the timestamp shortcut in vim
Added last command result to status line in zsh
Merge branch 'master' of github.com:dedmons/dotstuff

Conflicts:
	zsh/zshrc