Fixed typos
Merge pull request #86 from pborreli/typos

Fixed typos
Merge branch 'master' into 0.3

Conflicts:
	lib/boom/storage/json.rb