update master with changes from develop.

removing develop branch. using pull requests (ie github flow) over git-flow.