Committing changes to the scripts made on the server
Merge branch 'zanzibar' of https://github.com/mikeymckay/coconut into zanzibar

Conflicts:
	scripts/coconutTriggers.rb