Added companion_messages table and updated version of vagrant needed to get the dev env up and running
Merge remote-tracking branch 'origin'