Moved grunt tasks back into one file. Added grunt-concurrent