Oops
Lots for one commit because I'm lazy

- Clean up script, add rollback and haproxy-reload commands
- Add health check and rename method
- Some new haproxy cfg settings
Fix some host settings in rollback and pull in haproxy-reload
Merge branch 'master' into tornado