Merge pull request #34 from habuma/master

Sync up on security integration work and updates to dependencies.
Addressed the optionality of the security module.
Merge remote-tracking branch 'upstream/master'