Try not to clobber everyone's constants on every change
improve wikipedia import
Merge branch 'master' of https://github.com/SeanTater/uncc2014watsonsim
Merge branch 'master' of https://github.com/SeanTater/uncc2014watsonsim
Temporarily undo Jagan's separate indexes (now in a new branch) so that users doing homework can get it working first