Merged in rw_grim/pidgin-nest (pull request #83)

A start to migrating the security stuff, it's mostly self explanatory but we'll need to document some of how this works