support deploying from orta's computer
Merge remote-tracking branch 'upstream/master' into RAC2
merge changes
Merge pull request #64 from orta/RAC2

@ashfurrow => support deploying from orta's computer