gitignore and green man highlight
combine changes from scrod and sparge?