Update master to match community version

No functional changes, there was a accidental merge and then a revert.

After this you'll create a new dev branch, by typing in the branch selection dropdown.  Make sure this PR is merged first

![screen shot 2014-09-01 at 10 13 14 am](https://cloud.githubusercontent.com/assets/751143/4110944/5b9bb7ac-31fb-11e4-8936-33134f4c85f2.png)