actually commiting stuff :|
Merge pull request #868 from rdodev/tags

Re-adding marketing tags as per their request.
Merge pull request #869 from rackerlabs/dev

re adding re-marketing tags.