Updating to go1.3

plus a teensy adjustment to the Makefile for better Linux compatibility
(apparently grep wat!?)
Merge pull request #34 from travis-ci/updating-to-go1.3

Updating to go1.3