Merge branch 'release/2.2.0' into develop
Metadata fixups, tw2.core#90
Add a template for the ImageButton.
Py3 fixups in the templates.
Ask travis to start doing py3.3 for us.
2.2.0.2
Merge branch 'release/2.2.0.2'