pull request from E403 - Merge E309 extensions to Wiki textbook functionality

As part of CSC517 summer 2012 project, we forked an expertiza repository and created a development branch to pick up code from ajdavis7/E309. We tested the functionality of the code on that branch and then merged local master to our deveopment branch. After conflict resolution and bug fixes, we have documented our merged results in README.