add those things
change back to metalsmith and use grunt
Merge branch 'master' into temp