Initial dist subtree commit
fix gruntfile
include angular in build
small change to grunt
make styling changes
small design changes
add some styling
small changes
fix merge conflicts