GMail has gained some new inbox options. These automatically filter messages into some predefined categories. You can enable these now by clicking on settings (the cog in the top right corner):
Select configure inbox and then choose the categories you want to appear:
If you pick them all the top of your messages will now be sorted into a number of categories:
You can pick the categories you want and go back to your old inbox in your inbox settings in options. Seems to work well at the moment.