Build fixes after moving to go1.4
Merge pull request #113 from harshavardhana/pr_out_build_fixes_after_moving_to_go1_4