Massive update.
Merge branch 'master' of github.com:cahirwpz/phd