Change crappy nonstandard name 'upstream' to nice standard name 'origin'
Merge pull request #98 from andralex/upstream2origin

Change crappy nonstandard name 'upstream' to nice standard name 'origin'