Squashed 'src/machinetalk/proto/' changes from 0b94620..4495f3e

4495f3e Merge pull request #8 from strahlex/newfield
23ca9da machinetalk-protobuf: added name field to config
db74406 Merge pull request #7 from strahlex/includefix
ee81808 machinetalk-protobuf: rename ERROR to fix aliasing on Windows
a947f40 machinetalk-protobuf: disable proto.js compiler per default
8db45ae machinetalk-protobuf: remvoed unused include to fix warnings with protoc 2.6

git-subtree-dir: src/machinetalk/proto
git-subtree-split: 4495f3e0d665fb4c721bd51aa8c3b121dd0328d8
Merge commit 'f8de9a9d4d4746b6c044d758b896bfd293396788' into launcherfix
Merge pull request #379 from strahlex/machinetalk-update

Machinetalk-protobuf update