Change import order.
Merge branch 'master' into gh-pages
Add grid documentation.
Add site to gitignore.