initial commit of new version (we now sit in ~/ rather than copying)
Merge remote-tracking branch 'origin/master'
moved to . filenames