Update Thanks and TODO
Merge branch 'master' of github.com:choptastic/nitrogen