Bugfixes. Removed testing from Gruntfile until we have tests. Moved things around