initial commit
Merge https://github.com/jackdeadman/spotlight