Add more TODOs
Merge remote-tracking branch 'origin/master'
Move Bitdeli badge to top of README