A whole bunch of updates and changes. First real release
Merge fixes