Merge pull request #24 from horakmar/master

Add configuration options for integration with glance.