More login items.
Merge remote-tracking branch 'nathan/master'