new file:   .Xdefaults
	renamed:    xmonad/.xmonad.hs.swk -> .vimrc.swp
	renamed:    xmonad/.xmonad.hs.swh -> .xinitrc.swp
	modified:   bashrc
	new file:   command-t-1.4.vba
	new file:   config/nitrogen/bg-saved.cfg
	new file:   config/nitrogen/nitrogen.cfg
	new file:   config/openbox/autostart
	new file:   config/openbox/autostart~
	new file:   config/openbox/menu.xml
	new file:   config/openbox/pipemenus/dash_places_menu.sh
	new file:   config/openbox/pipemenus/recently_opened_menu.sh
	new file:   config/openbox/rc.xml
	new file:   config/openbox/rc.xml~
	new file:   config/ranger/bookmarks
	new file:   config/ranger/history
	new file:   config/ranger/tagged
	new file:   config/spacefm/bookmarks
	new file:   config/spacefm/session
	new file:   makeDotFiles (wopr's conflicted copy 2013-02-26).sh
	new file:   makeDotFiles (wopr's conflicted copy 2013-02-26).sh~
	new file:   makeDotFiles.sh~
	new file:   mpdconf
	new file:   screenlayout/skjavarpi.sh
	new file:   shortcuts/devServerkefni.sh
	new file:   shortcuts/devServerkefni.sh~
	new file:   shortcuts/lecCosmo.sh
	new file:   shortcuts/lifeintheUniverse.sh
	new file:   shortcuts/pyPlot.sh~
	new file:   vim.zip
	modified:   vim/.VimballRecord
	new file:   vim/after/plugin/snippets.vim
	new file:   vim/autoload/Align.vim
	new file:   vim/autoload/AlignMaps.vim
	new file:   vim/bundle/julia-vim
	modified:   vim/commands.txt
	new file:   vim/doc/Align.txt
	modified:   vim/ftplugin/latex-suite/templates/noteMaster.tex
	new file:   vim/plugin/AlignMapsPlugin.vim
	new file:   vim/plugin/AlignPlugin.vim
	new file:   vim/plugin/cecutil.vim
	new file:   vim/snippets/idlang.snippets
	modified:   vim/snippets/python.snippets
	modified:   vim/snippets/tex.snippets
	new file:   vim/snippets/xml.snippets
	new file:   vimrc2~
	new file:   vimrc~
	modified:   xinitrc
	deleted:    xmonad/.xmonad.hs (wopr's conflicted copy 2013-06-14).swg
	deleted:    xmonad/.xmonad.hs (zen's conflicted copy 2013-06-14).swg
	deleted:    xmonad/.xmonad.hs.swe
	deleted:    xmonad/.xmonad.hs.swf
	deleted:    xmonad/.xmonad.hs.swg
	deleted:    xmonad/.xmonad.hs.swi
	deleted:    xmonad/.xmonad.hs.swj
	deleted:    xmonad/.xmonad.hs.swl
	deleted:    xmonad/.xmonad.hs.swm
	deleted:    xmonad/.xmonad.hs.swn
	deleted:    xmonad/.xmonad.hs.swo
	deleted:    xmonad/xmonad (wopr's conflicted copy 2013-06-14).hs~
	modified:   xmonad/xmonad-x86_64-linux
	modified:   xmonad/xmonad.hi
	modified:   xmonad/xmonad.hs
	deleted:    xmonad/xmonad.hs~
	modified:   xmonad/xmonad.o
	renamed:    xmonad/xmonad-x86_64-linux -> xmonad/xmonad/xmonad-x86_64-linux
	modified:   xmonad/xmonad/xmonad.hi
	modified:   xmonad/xmonad/xmonad.hs
	modified:   xmonad/xmonad/xmonad.hs~
	modified:   xmonad/xmonad/xmonad.o
fix xinitrc