micro cleanup
Merge branch 'master' of github.com:xen/fontbakery
Merge branch 'master' of github.com:xen/fontbakery
Merge branch 'master' of github.com:xen/fontbakery
fix broken virtualenv without version
Merge branch 'master' of github.com:xen/fontbakery
some changes
Merge branch 'master' of github.com:xen/fontbakery
Merge branch 'master' of github.com:xen/fontbakery

Conflicts:
	bakery/project/models.py