Got most of the angularfire-seed files merged in. Still a few js and html files to do
Finished angularfire-seed merging