Updated travis config
Another change to the travis config
Tweaking travis config
Tweaking travis config
Tweaking travis config
Tweaking travis config
Tweaking travis config
Merge branch 'master' into 2014_04_16_rect
Working on the grid and inspector