Merge pull request #28 from daniellemayne/2013.07

2013.07 - increase timeout when waiting for server to stop prior to termination