Email Address as username returns 401 Unauthorized against Ondemand. 

Hi,

Great tool by the way, the only issue I've found is that the Base64 encoding/basic auth doesn't work when you use email addresses as the login, against ondemand instances. 

ie - username: foo@foo.com doesn't work, but username:import does. password same in both. 

I suspect the encoding doesn't like the punctuation and special symbols, but I can't be sure. 
