+ Introducing the feature system
+ some refactoring of existing code
Merge pull request #1 from bcwadsworth/featureSystem

+ Introducing the feature system