Update Makefile deps rules to restore dependencies from godep