Merge pull request #6 from warewolf/master

Fix status.xml to use the newly named status flag file.
sync with working dir
sync with working dir
sync with working dir
Update to deployed data
Merge branch 'master' into deployed
Merge remote-tracking branch 'origin/master'