grunt refactoring
more refactoring, now cleaned up the grunt task so it builds properly