Merge branch 'jade-grunt'