improve simulator - add TV watchers
upgrade to play 2.2.1
update todo list
Merge branch 'master' into simulation

* master:
  update todo list
  upgrade to play 2.2.1

Conflicts:
	todo
don't recommend safari (can't play ogg/vorbis)
improve simulator some more