added NOOP delegate adapter and ability to build service with keystore
Merge pull request #93 from karldmoore/master

Builder and Delegate changes