Updated TODO and simulator settings
Merge branch 'master' of github.com:blueCommand/or1k-devel