Fixed lots of bugs caused by moving around files and renaming things.  Also got gulp working all the way