error in function name
Merge branch 'master' of github.com:twist/rc_lib

Conflicts:
	rc/vimrc
  scratchpad and old version hack