Updated Godeps to latest versions of cobra and pflags, modified test file and removed extraneous comments and code
Merge branch 'fixes' into peers