Merge and sync develop branch

Net result is that the custom AMI is specified, and we stay on 64-bit Tomcat7 Java6.
The change to move to Tomcat7/Java7 should not have been on develop.