genesis
fixes odd gitignore merge'