simplify

Conflicts:
	src/Bacon.coffee