Updating to the latest foreman

Also aligning my boxen with Githubs a bit more. Removing some comments
so that it matches theirs.