Merge remote-tracking branch 'refs/remotes/origin/master' into dev
Fixes #1
Move an existing folder to origin if origin doesn't already exist so symlink can be set up.
Clean up output.
Merge remote-tracking branch 'refs/remotes/origin/dev'