Removed Zurb dependency, started working on prototype style separations, in the process of removing the sass cache to ignore in the future.
Fixing conflicts
Fixed conflict bug.
Changing a comment.
Forgot to pull subtree module first.
Added grunt and needed plugins to control build the phi engine and its demo. Cleaned up the navigation styling and js. Cleaned up the typography core and moved styling to prototype.scss. Some stuff I can't remember.