Cleaned up the default install templates.
Fixes datatype bug
Merge branch 'rc3' into feature-paypalexpress