initial commit for upload5
Merging with wmak upload branch to fix path problems
Changed wmaks code to conincide with proper GOPATHS