did some test prep
fixed merge conflicts
update grunt
Add Karl's testing changes
Merge branch 'kgentner-LindaDev' into LindaDev