Moved config things
Simplified stuff
Fixed grunt build
Simplified things some more
Fixed Gruntfile