Version 0.42

- Hopefully fixed conflicts... I think Github finds pleasure in screwing
up files