Make things shorter
Merge branch 'master' of github.com:wsmithril/keystone