Fixed a recursion problem.
Minor editorial changes.
Added extension schema for the PE_FIM use case and a test of the same.  More about PE-FIM here http://arxiv.org/abs/1401.4726
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added encryption certificate