Cleaning up grunt config and fixing middleware config