Merge branch 'bugfix' of https://github.com/banana-slugs-2014/GlucoseAmigo
Merge branch 'master' of https://github.com/banana-slugs-2014/GlucoseAmigo
Fix #119 But introduce new bug, pushing to pull back and work on another machine
Add dashboard partial and change update route inside account controller
Rewrite Diabetics routes to stick to the new convention
Refactor doctors controller to the new convention
Refactor preferences controller to the new convention
Refactor records controller to new convention
Refactor prefences controller to reflect new dashboard partial style
Change feature specs to not expect redirect
Extract JSON render calls in controllers into helper method