Merge pull request #26 from apelade/develop

update ubuntu-install.sh, added memory and cpu prefs to Vagrantfile
Added Windows/Vagrant ssh information
Merge pull request #27 from mblack/develop

Added Windows/Vagrant ssh information
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
add Gemfile.lock