Back in development! Committing old changes

I think a lot of this is just line ending differences between OSes