Add spikes and make orbs update health status
Merge branch 'master' into gh-pages