xampp
svn support
better 'dirty' symbol. svn S symbol
vcs gutter is better than gitgutter
rm git plugin
mamp, not xampp. diffmerge.
mongodb on startup always
ignore svn files
merge with upstream