remove Gemfile.lock entirely, let jenkins sort it out
also needed automake O.o
increment version for development
Merge branch 'master' of https://github.com/opscode-cookbooks/apache2