vim: comment out klen/python-mode
merge dropbox