refactored tags, created tests
Merge pull request #22 from tutumcloud/staging

refactored tags, created tests