Merge pull request #5 from andreasrosdal/master

Sync cazfi with my latest development on freeciv-web. Current build on production server.
Wait until everything is started before starting wait for status test
("&&" instead of "&"). Status test sometimes run before everything was
up and running.
Do any working directory changes in a subshell so that working directory
of the main shell remains correct.
Merge pull request #17 from cazfi/master

Sync with latest updates from cazfi.