Tagging

Merge tagging into master, yay!