Darcy

Fixed up branch name conflict and cleaned up a bunch of files which we should not be tracking (e.g., *.suo files)