change admin account username to devops, to avoid name conflict with built-in "admin" group in Ubuntu 12.04
bump patch version
Update users.rb
Update default.rb
Update users.rb
Update Berksfile
Delete metadata.rb
Delete metadata.json
Create metadata.rb
Update users.rb
Update users.rb
added swapfile and hosts -- for ec2
added ubuntu to sudoers
Revert "added ubuntu to sudoers"

This reverts commit 405679c27e8b2cea893f74c7625ed7ac8c3df67a.
Merge branch 'master' of github.com:ajgrayson/appbox-cookbook
removed imagicmagic
Merge remote-tracking branch 'cxz/master'