add remove/spaces to conform to coding standards
Merge branch 'master' of https://github.com/trema/trema-edge