Add .gitkeep to .gitignore.
Merge branch 'tools/ubuntu-12.04-base-box' into tools/puppet-box