removed rvm
added zencoding vim plugin
fixed submodule conflict