Simplify a couple things
Use godeps