Removing redundant arguments
Simpler to use config methods so we don't have to expose string keys as constants
Merge pull request #28 from alxdarksage/context

Context
Better tests.
Merge remote-tracking branch 'upstream/develop' into develop