fixing upbrew alias. adding bluenight alias. fixing prompt. adding grunt completion
fixing merge conflicts