* This should close Issue #3 and Issue #2
* This should close Issue #14 ... mostly
* Finishing off Issue #14
* Cleaned up jimshoe's weird whitespace
Fixed compleation for list on issue 14
Merge branch 'brimstone-issue14' into dev
Closing Issue #14
Merge branch 'brimstone-issue3' into dev
Closing Issue #3