cleanup & preparing to merge
modified .gitignore