Summer14 visualforce pages metadata changes.
These changes keep cropping up in my working copy.
Merge pull request #891 from SalesforceFoundation/feature/summer-14-changes

Feature/summer 14 changes
Merge dev into feature/362-trial-walkthrough