add variant tracking

tracks all variants, but only uses universal for incrementing
Merge branch 'master' into variants

Conflicts:
	Gemfile.lock
Merge pull request #1 from mroth/variants

add variant tracking