initial work on master, gitignores updated