Really fix windows newlines this time
Move requires around to play nice with composer