Merge pull request #5 from samebchase/samuel-devel

samuel-devel: Add new skeleton code, and massively reorganise /everything/
Merge branch 'master' into samuel-devel