Merge pull request #248 from karissa/master

BUG: https will work now
BUG: localhost:5000 case was getting clobbered