Include vcsh again and manage prefs

On ubuntu mr will fail to grok vcsh repos without that line.

Also check out my prefs repo using mr.