improved grunt tasks, added watch, attempt to fix the popover issue #23