Some fixes, removing dead code.
Merge branch 'gh-pages' of https://github.com/symaxian/SeniorDesign into gh-pages