Merge reward back into habit views & templates

app/assets/javascripts/backbone/templates/habits/habit.jst.ejs

@@ -2,14 +2,18 @@
 <% if (habit_type==1) { %>
   <a href="#" class="vote-up"><img src="assets/add.png" /></a>
   <a href="#" class="vote-down"><img src="assets/remove.png" /></a>
-<% } else { %>
   
-  <!-- Daily & Todos -->
+<!-- Rewards -->
+<% } else if (habit_type==4) { %>
+  <a class="buy-link" href=#><img src="assets/dollar.png" /></a>
+
+<!-- Daily & Todos -->
+<% } else { %>  
   <input type="checkbox" <%= done ? "class='vote-down' checked='checked'" : "class='vote-up'" %>/>
   
 <% } %>
 
-<span class="habit-text"><%= name %></span>
+<span class="habit-text"><%= name %><%= habit_type==4 ? "($"+score+")" : '' %></span>
 
 <div class='habit-meta'>
   <a class="edit-link" href="#/<%= id %>/edit">Edit</a>

app/assets/javascripts/backbone/templates/habits/reward.jst.ejs

@@ -1,7 +0,0 @@
-<!-- TODO buy link -->
-<a class="buy-link" href=#><img src="assets/dollar.png" /></a>
-<%= name %>
-($<%= score %>)
-<div class='edit'>
-  <a href="#/<%= id %>/edit">Edit</a>
-</div>