Cleanup, etc
Merge branch 'master' of github.com:mxr576/prf2014