Adapt .gitignore to new folder layout
Save cookbook versions in Berkshelf.lock
Give the vms more memory
Use ruby version defined in .ruby-version
Fix ruby installation
Merge branch 'with_ruby_install'

Conflicts:
	cookbooks/owncloud-testing/recipes/default.rb