Changed gb settings to use strings rather than named constants.
Merge branch 'upstream' into fork
Revert "Changed gb settings to use strings rather than named constants."

This reverts commit 4572d2e320208bbbf8a6573daa1f977135df3fde.
Merge branch 'upstream' into fork
Removed trailing whitespace
Merge pull request #53 from jlmaccal/fix-whitespace

Fix whitespace issues