cleaned up gruntfile to get rid of ng-annotate
Merge branch 'issue22' into dev