Merge Develop and Get rid of develop.

As we are making lots of changes to SimPEG, @dwfmarchant and @sgkang have proposed that we scrap the develop branch for now until we have a more stable release.