General cleanup
Merge branch 'master' of github.com:mfdeakin/panfea
More cleanups, fixed warnings