Cleanup, refactoring, .gitignore on more formulas and deploy_keys/*

* Add formulas and deploy_keys/* to .gitignore
* Break generic/misc state files into system/, mostly
* Comment out stuff that isn't functional yet