Updated for new files, removed contact options
Merge branch 'master' of github.com:snaggled/webrtc-jingle-client