Merge pull request #111 from eevee/master

Eevee's fork
Search paths calculation moved to reset()
Version numbers updated (for v1.2.0 release)
Moved code around for easier syncing
Code cleanup
Line numbers fixed (from master)
Don't duplicate @media blocks.  Fixes #69, ported from rsternagel's pull #112.