some housekeeping file changes
Merge branch 'melon' of github.com:CarrotIsland/puzzle-jam into melon
tidying up