Merge commit '1d4bfb91a8518dc04ed1be7fddc665fb121eacc4'

I do not know why I'm merging.
Merge commit '7d5d04769a4b2674968ace9920dff0991e7d0b08'

Merging changes to phi into phi-framework.
Fixing some issues with the framework.
Merge commit 'b3fbf73edab74e7421afa01e28e9fb4047f6bba9'

Merging in changes from phi.
Removing and ignoring node_modules.
Removing node_modules for later ignoring.
Ignoring node_modules at root level.