The gyp file needed to be updated - not sure if this is the right way to do that
Minor - broke single line into multiple
Messed up a merge
Merge branch 'master' of https://github.com/snaggled/webrtc-jingle-client

Conflicts:
	saltim.gyp
Merge branch 'master' of github.com:snaggled/webrtc-jingle-client