Update deps
Remove nil layout - this causes a warning in 2.2.0
Update todo list