Added timeout
Altered timing in tests
Updated build.xml
Merge pull request #6 from ryanshawty/keepalive

Added timeout