fixed a few minor bugs, moved routes out of server, fixed up gruntfile and some paths