Removed RainbowParen from .vimrc.
Merge branch 'origin/navi' into marvin

Conflicts:
	home/dnoland/.vimrc
Added link to install for root user.
Added NERDTreeBookmarks data.
Pulled in tabline changes from powerline 1.1
Disabled dbext vim plugin do to mapping conflict.
Minor updates to vundlerc
Fixed .ssh/config
Removed "print-settings" file from marvin branch
Merge remote-tracking branch 'origin/navi' into marvin

Conflicts:
	home/dnoland/.vimrc
Merge remote-tracking branch 'origin/mike' into marvin

Conflicts:
	home/dnoland/.ssh/config
	home/dnoland/.vimrc
	home/dnoland/.zprofile
Merge remote-tracking branch 'origin/marvin'

Conflicts:
	home/dnoland/.ssh/config
Ignore private root file in most versions