Merge pull request #35 from gvwilson/master

Clearing out unused files and moving others to 'assets'