Remove custom todo stuff in favour of todonotes package
merge with upstream
Merge pull request #7 from dominiquedevriese/master

Remove custom todo stuff in favour of todonotes package.