Add my ingnores (GAE lib dir and sublime files). Make Vim default editor!
Merge branch 'master' of github.com:mrfuxi/dot-files

Conflicts:
	.gitignore_global