Merge branch 'master' into trim

Conflicts:
	Todo.elm
	elm-package.json