Minor code cleanup.
Merge branch 'master' into constraint-strat

Conflicts:
	lib/bud/bud_meta.rb