Merge pull request #126 from go-gl/early-2015-overhaul

Change import path according to early 2015 plan.