Gabriel/make specs pass

The spec suite is currently unrunnable — this is everything I had to do to fix that. Also going to get this on Travis CI so we can avoid getting into this situation again.

@xaviershay @sul3n3t @tamird @sconover @rudle @tylerkovacs