Updating to Push Class skills on level up

Update from DND5E beta for Class Skills on level up and other various fixups

templates/apps/ability-use.html

@@ -5,7 +5,7 @@
     <p class="notification error">{{localize this}}</p>
     {{/each}}
 
-    {{#if hasPowerSlots}}
+    {{#if canUpcast}}
     <div class="form-group">
         <label>{{ localize "SW5E.PowerCastUpcast" }}</label>
         <div class="form-fields">
@@ -19,12 +19,10 @@
         </div>
     </div>
 
-    {{#if canUpcast}}
     <div class="form-group">
         <label class="checkbox"><input type="checkbox" name="consumeSlot" checked/>{{ localize "SW5E.PowerCastConsume" }}</label>
     </div>
     {{/if}}
-    {{/if}}
 
     {{#if hasLimitedUses}}
     <div class="form-group">