First pass at adding and deleting tags.
Merge branch 'master' of https://github.com/CIIR/Proteus.git