Fixes for mono.
Ignore monodevelop's prefs.
Merge.