update variables file organization
Merge branch 'templated-customizer' of github.com:twbs/bootstrap into templated-customizer

Conflicts:
	_includes/customizer-variables.html