Merge pull request #8 from gcborders/master

Merge Sama's Changes
Merge pull request #13 from gcborders/master

Pull From Master
OS-Specific Spacing in Main Window

Add option to change spacing based on OS.
Merge pull request #15 from gcborders/jim_backup

OS-Specific Spacing in Main Window