replace nerdcommenter with tcomment
update submodules
apply pathogen changes
using jedi for python autocompletion
ultisnips reserved snippets/ directory for snipmate snippets
initial i3 config with i3pystatus
fix merge conflict