Cleanup chores.js
Cleanup chores spec
Merge branch 'develop' into dennis-code-cleanup

Conflicts:
	public/app/components/chores/chores.js
Merge pull request #307 from Wizecoder/dennis-code-cleanup

Cleanup Dennis's code