Added more aliases.
Install JDK7 on each machine; install PuppetDB on the Puppet master VM.
Add ant puppet class application to antcentos.local.
Fix merge errors.