Pre v0.6
Merge branch 'master' of github.com:Wardrop/Scorched

Conflicts:
	Milestones.md
	lib/scorched/version.rb