Fix --package mode + github, so both dev/package mode work!
Merge pull request #49 from andymcc/master

Merged automatically by jenkins after successful gate test