Merge pull request #97 from aenario/master

Widget And Grid
Merge pull request #102 from aenario/master

style improvements
fix travis tests