Merge pull request #1156 from FranciscoBorges/master

merge andy's commit
upgrade proton to 0.4
removed unwanted dep
Merge pull request #1157 from andytaylor/master

proton fixes