re #41 - Changed grunt to same setup as on timble website
Merge branch 'feature/33-nyamu' of github.com:nooku/www.nooku.org into feature/33-nyamu

Conflicts:
	css/style.css
	css/style.css.map
re #41 - recompiled after merge