Merge pull request #27 from AlexanderPavlenko/master

Fix names collision
Cleanup MappingTest#test_merge_mapping
Support and test postgresql. Fix #28
format it
Don't support comma delimited servers
Add a test for the update callback
support http basic auth