Brought in sync with latest ngbp changes, plus added ng-annotate support (something ngbp has not done)