changed gruntfile ordering as well as added more scripts, currently running into weird dep problems
resolved merge diffs