Revert "Hilite lines over 78 chars in vimrc"

This reverts commit 7ba6f0d8e27c5f39cf8dcc29256a36686ddd6662.
Merge branch 'master' into vaddio
Ingnore nohup.out, jq binary
Tweak .ackrc
Add screengrab aliases
Add gulp completion
Add git SHA1 to PS1
Update PATH
Add -T shortopt for passthru to ack
Append more common annoyances to gitignore
Fix subl bin
Add some git aliases
Add whitespace handling to gitignore
Update git pretty format
Enable git rerere
Use tabs in gitconfig for consistancy
Add sqliterc
Add git-remote-branch-status bin script
Add zsh git aliases
Merge branch 'master' into vaddio

Conflicts:
	gitignore