updated things
Merge branch 'master' of http://github.com/joker23/.vim

this merge was necessary....i think
remodelled