Fixed issue when compiling on Xcode 6.1.
Added settings icon.
Changed how shortcut matching behaves.
Minor cleanup.