Moved keyspace back to options
Changed to not break existing API
Merge pull request #72 from arr-ee/keyspace-in-options

Moved keyspace back to options