wip
merged
fixed the build tasks, and changed the grunt variables so that they just reference each other
cleaned up gruntfile some more