return to d7f690d6d03c40109977645760005c32278f334e
update godeps, formatting
Merge pull request #73 from canaryio/serious-cleanup

Serious cleanup