Fixed sub-package references. Commented out broken top-level test code.
Added tests for relative and absolute paths
Fixed merge conflict
Merge remote-tracking branch 'rod/master'
Merge remote-tracking branch 'rod/master'
merged rod/master
Merge remote-tracking branch 'rod/master'
Merge remote-tracking branch 'rod/master'
Removed error type checks. They were failing, and there's no point in doing them.
Merge remote-tracking branch 'rod/master'
Merge remote-tracking branch 'upstream/master'
Fix time.After leaking.
Merge pull request #31 from adam-p/master

Fix time.After leak