Make a ProxyResource which extends Resource, rather than injecting methods into Resource
Whoops, leftover include
move Sitemap into application, it's core to the entire system
Switch from ActiveSupports delegate method to Ruby 1.9+ def_delegator
Load templates from Git
Merge pull request #1286 from middleman/git_template

Load templates from Git
Pull mixin for extension activation into a real class
Convert renderers into first-class extensions
Data ext doesn't need to touch the app obj
Remove App include in File Watcher
get i18n's hands out of app too
Update badges
Reload MM on environment and helpers_dir changes. Closes #1274. Closes #1105
Merge pull request #1315 from Arcovion/v3-stable

Update badges
Update README.md
bump aruba dep
Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable
merge
refer to v4 in readme
Remove neighbor frontmatter support