s/tier/program/
Merge pull request #643 from rackerlabs/dev+

s/tier/program/
Merge pull request #644 from rackerlabs/dev

Pushing to production after reviewing on staging