Did a ton of stuff
Merge branch 'master' of github.com:Annath/bamboo-monitor