fixed bad join query and properly check for IP in use
Merge pull request #23 from markmcclain/ip_conflicts

fixed bad join query and properly check for IP in use