init commit of config files
added mc and vimprojects
added xresources mc and openbox
fixed fancy titlepane with summary
added checking for xmodmap
changes from office comp
Xresources from lappy
fixed Xresources
new branch for laptop specific config
added config for pidgin, zsh autocomplete
Merge branch 'master' of github.com:jagguli/config
added zshenv and zshprofile
pimped prompt
Merge branch 'master' of github.com:jagguli/config
updated zshrc for oh-myzsh
added local git config
merged with master
Merge branch 'master' of github.com:jagguli/config

Conflicts:
	.Xresources
	.config/openbox/dir-menu
	.config/openbox/rc.xml
	.mc/ini
	.vimprojects
	.xmodmap
	.zshrc
	.zshrc.arch
tweakd tmux.conf
Merge branch 'master' of github.com:jagguli/config

Conflicts:
	.tmux.conf
	.zshrc