normalize line endings
updated git ignore
normalize branch
Merge branch 'master' into irjudson