Fixing some issues with the framework.
Merge commit 'b3fbf73edab74e7421afa01e28e9fb4047f6bba9'

Merging in changes from phi.
Merge commit '036736aece746f17fcc12c99a2e9184a2aa280a6'

Merging in changes found in PAS.
Modifying Gruntfile and package file to reflect new changes from PAS.