A lil story cleanup, plus fixed part of our jQuery for github
Cleaned up inconsistancies in variable and parameter names
Merge branch 'master' into planner_refactor