Lots more styling work

Take three on the gitignore…