snipmate plugin was giving me problems (replaced with scrooloose version)
just fixing some things, moving code around