Update license
Merge
Use grunt-testacular
Update to the latest grunt