Merge branch 'master' into mean

Restructure new templates to conform with lean packaging

Conflicts:
	lib/tilt.rb
Merge with master
Merge branch 'mean' of github.com:ujifgc/tilt into lean-and-mean

Conflicts:
	lib/tilt.rb
	lib/tilt/csv.rb