Nightly into Master

Master will now be my working branch (in this repo)