Line endings
Adding berksfile and Vagrantfile
Adding initial bootstrap script for ruby and rubygems
Adjusting berksfile and bootstrap script
Adding chef config
Fixing tasks and such
Adding some missing images
Resolving merge conflicts