refactor
Use grunt, and impress.js
Merged from remote