Incorporated Richard's changes. Made a bunch of other edits.
Merge branch 'master' of https://github.com/rcarlso1/ML-FinalProject2012-EdModeling