.vimfiles
.git files
.zsh files
.rbenv files
.zprofile
runlevel not accessible by users in openSuSE
update oh-my-zsh with custom theme
fix syntax error in .gitmodules
disable zsh autocomplete
only run startx if $DISPLAY is the empty string
update oh-my-zsh
add rbenv plugin for updated oh-my-zsh theme

Conflicts:

	.oh-my-zsh
update oh-my-zsh
update .oh-my.zsh
update oh-my-zsh
pentadactyl files
automatically set Guardfile filetype
use npm plugin
add pathogen to .vimrc
default --rebase on git pull