Revert "Merge Bmiller"

Reverts dudemire/hadashboard#2