some vim changes, a change to the grm alias
merge