Trim Mediawiki text
Merge branch 'development' of https://github.com/SeanTater/uncc2014watsonsim into development
Fix filename extension