Quick cleanup

Hi Isidro

I'm not doing major changes but a bit of moving things around, ignoring things and deleting unneeded things. You can now switch to the branch that I created and pushed to github to review the changes and comment on them before I merge it.

What I did to do this was, git checkout -b quick_cleanup
then everything else as normal
then push with git push origin quick_cleanup

then I come and review it here and if it looks ok then I create a pull request which sends a message to all the contributors saying 'have a look'. They (you) can comment and when they are happy, then the branch can be merged (in this case by the person who owns the branch), but in a bigger project maybe by the person managing the project. Or if we get other collaborators later, one of us might want to do the merge instead of the 'new' person.

Let me know what you think
Cheers
Daniel