untangle web of ridiculous arrows and swipes, hopefully everything is entirely working and perfect in js now (we can only hope)
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into building_out_ajax
Merge pull request #32 from nealcpeters/building_out_ajax

Building out ajax
Merge pull request #31 from nealcpeters/fixed_broken_show_view

Fixed broken show view
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into fixed_broken_show_view