Cleaning up some more of the merged in stuff.
Checking in the app/components. I would never want to do this on the master branch but it is needed here because I'm making a running site.