Do away with develop branch

Merge develop branch into master.  Please delete develop branch after pull.