Remove redundant file
Update TODO
Merge branch 'develop' of github.com:joelkuiper/spa into develop

* 'develop' of github.com:joelkuiper/spa:
  Code style
  Smaller highlight text