added tag support for builder
Merge pull request #8 from ehazlett/master

Adds tag support for builder