Merge branch 'kyle'
Merge branch 'kyle'
Merge branch 'kyle'
Merge branch 'kyle'
Made it so default template is selected when API key first entered.
Merge branch 'master' into kyle