Grunt 0.4 updates - not fully tested. #2 #3

Address #2 #3.

Have not tested this one 100% in all use cases (fresh to this), but this got replacing working I believe.