Some code cleaning, some tests
Merge branch 'jannis' of https://github.com/dadarakt/jamon into jannis