Merge pull request #51 from Trott/master

update .gitignore for new CI file layout
reverted changes to gitignore list
Merge pull request #52 from ucsflibtopfstedt/master

revert changes to gitignore list