Don't run double sanitation on a string.

This messes up legitimate markup returned by sanitize, such as &lt; when
a description contains '<'.
Merge branch 'master' of git@github.com:graaff/tracks
Don't run double sanitation on a string.

This messes up legitimate markup returned by sanitize, such as &lt; when
a description contains '<'.
Merge branch 'bsag'

Conflicts:
	app/views/todos/_todo.html.erb
Merge branch 'master' of github.com:graaff/tracks

Conflicts:
	app/views/todos/_todo.html.erb
Fix broken merge.
Merge branch 'master' of git://github.com/bsag/tracks into bsag
Merge branch 'bsag'
Merge branch 'master' of git://github.com/bsag/tracks into bsag
Merge branch 'master' of git://github.com/bsag/tracks into bsag

Conflicts:
	app/views/todos/_todo.html.erb
Merge branch 'master' of git://github.com/bsag/tracks into bsag
Merge branch 'master' of git://github.com/bsag/tracks into bsag
Merge branch 'master' of git://github.com/bsag/tracks into bsag
Merge branch 'master' of git://github.com/bsag/tracks into bsag
Merge branch 'master' of git://github.com/bsag/tracks into bsag
Merge branch 'master' of git://github.com/bsag/tracks into bsag
Merge branch 'master' of git://github.com/bsag/tracks into bsag
Merge branch 'master' of https://github.com/TracksApp/tracks into upstream
Merge https://github.com/TracksApp/tracks into upstream
Merge branch 'master' of git://github.com/TracksApp/tracks into upstream