Fix rsync tasks for staging cowboy dev/bugfixing
Merge branch 'develop' of git://github.com/johnshopkins/machado into develop