Merge pull request #221 from BU-CS673/production

Production
Resolve Issue #219

Added braces to DEBUG if statements in PreferencesController

Resolves issue #219
Merge pull request #222 from BU-CS673/Ethan-Staging

Resolve Issue #219
Merge pull request #210 from BU-CS673/Brandon

Add map parser, fix several integration tests.
Merge pull request #234 from BU-CS673/production

Production back into my working branch!