Merge pull request #62 from vincentvdk/master

Added Ton's talk
Update schedule for CFEngine-Rudder room
Merge pull request #63 from jooooooon/master

Update schedule for CFEngine-Rudder room
Added Mattias for the Ansible introduction