Made sparkup executable
Merge branch 'master' of github.com:jonnydark/Vim
Merge branch 'master' of github.com:jonnydark/Vim
Some small vimrc changes and some new stuff for django and coffee
Merge branch 'master' of github.com:jonnydark/Vim

Conflicts:
	vimfiles/syntax/coffee.vim
Merged