Merge latest thoughtbot/laptop