Escaped Git hell, added conditionals to cleanup
Merge branch 'master' of github.com:milescray/edurange

Conflicts:
	lib/edurange/cleanup.rb