Fixed option syntax (no space)
Removed duplicate acronyms
Merge pull request #1 from maurer/cmu-2013-fall

Fix some build issues