Merge remote-tracking branch 'upstream/master'
vim: solve some issues with auto-completion in python
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vim/UltiSnips/python.snippets
Merge branch 'master' of github.com:aaloy/dotfiles