Ready/134

Submitting this per https://github.com/slamdata/slamdata/issues/134#issuecomment-58668991

Hopefully it passes in travis, as I wont be available for a couple of hours.