Update system to meet coding standards
Merge branch 'master' of github.com:xmpp-ftw/xmpp-ftw-jingle
0.1.2