Updated TODO and CONTRIBUTING
Merge pull request #1210 from switchhax/master

Updated TODO and CONTRIBUTING