I rebased develop branch off of master for consistency

I would either re-pull from my repo or use this.