don't use rake with serverspec
Merge branch 'master' of github.com:flpjck/vagrant-flapjack
Upgrade to serverspec 2.  Unfortunately, this is currently broken due to asking for a sudo password, which doesn't exist on Ubuntu
Remove
Hardcode the host so that Net::SSH::Config.for(...) finds the right box.
Merge branch 'master' of github.com:flpjck/vagrant-flapjack
Merge pull request #18 from flapjack/serverspec2

Move to serverspec v2
Merge branch 'master' of github.com:flpjck/vagrant-flapjack
remove Gemfile.lock again
add Gemfile.lock to .gitignore
re-add Gemfile.lock, wrong project :-/
More rhel support
Merge branch 'master' into rhel-support