Grunt flow

Made some major refactor to our grunt workflow and dev/dist flow.