remove python-mode; add syntastic; fix paste line numbers for vim
add youcomplete me, remove jedi
ignore object files
merge