Changed profit to take into account the overhead along with the total labor cost

when profit is a %

* Fixed Models
* Fixed JS Calculator
* Cleaned up specs to access attributes directly

  #1349

app/views/deliverables/_form.html.erb

@@ -150,8 +150,9 @@ Object.extend(BudgetModule.prototype, {
             var materials_subtotal =  Budget.toAmount($('deliverable_materials').value);
         }
 
+        // Profit uses labor cost and overhead
         if ($('deliverable_profit').value.match('%')) {
-            var profit_subtotal =  (Budget.toAmount($('deliverable_profit').value) / 100) * cost;
+            var profit_subtotal =  (Budget.toAmount($('deliverable_profit').value) / 100) * (cost + overhead_subtotal);
         } else {
             var profit_subtotal =  Budget.toAmount($('deliverable_profit').value);
         }