Some improvements to the keystone module

Added some defaults for config options
Renamed all the variables that were named 'id' as it's a python built-in and that drives me crazy!