added some options based on peepcode vim screencasts