Was missing some settings
Merge branch 'master' of github.com:snaggled/webrtc-jingle-client

Conflicts:
	saltim.gyp