Consolidate

@popwarfour @JoshuaDickerson @the-hobbes @primehunter326 

Could you guys take a moment and look at some of the recent commits by yourselves and see if there are additional branches that should be pulled into this one to merge all the work done in the separated repositories (green-apps, green-web) and if there's some missing, then make a note on what branch they are on in which repository?

I'd like to merge in everything to this one again and delete the others, and then when we have all the info, we can do some clean up on the branches on this repository.