Merge pull request #1 from Weebly/master

Merge fork
Don't drop definitions map on the floor while reloading
Merge pull request #2 from dustindoiron/master

Updates to definition retrieval, reload, display