updating bug fixes
Presumed last commit before presentation
erge branch 'master' of https://github.com/charlespark/snppr into misc
Merging for the (supposed) last time before presentation.
Conflicts:
	app/controllers/categories_controller.rb
no real changes
Merge branch 'master' of https://github.com/charlespark/snppr
getting up to speed with the last pre-presentation updates.
Tuesday, October 14 afternoon commit
another try at the merge/commit