I changed my laptop and installed Connectify onto it. Then I tried to connect with my Atrix to the WiFi. It saw the hotspot but whenever I tried to connect the phone would say 'obtaining ip address' for about 2 minutes, then abort the connection. Another laptop could connect to the Connectify hotspot so the issue was on the phone.
Solved the issue by going into the WiFi settings on android, pressing the menu button, choosing 'Advanced' and selecting 'Enable Auto IP'. Then it connected! Hooray!