Various changes to johar.idf; changing modes on some source files.
Cleaning up a strange state of the repository.
Merge branch 'master' of http://github.com/jamieandrews/johar-git