Remove obsolete template (vendor change)
Merge branch 'master' of github.com:flavour/eden
Merge branch 'master' of git://github.com/nursix/eden