Do away with develop branch

Merge develop branch into master.  Please delete develop branch after pull.  I don't know the official version of firefly as it stands, but it would be a good idea to apply a version tag at this point.