Makes cci options additive. Resolves #28.
Fixes horrible syntax error
Reverts classmethods back to staticmethods
Merge pull request #31 from sudorandom/issue_28

Makes cci options additive instead of mutual exclusive