Rename test file to match elisp conventions

It's conventional to use '-' rather than '_', and following the convention will allow the file to be automatically excluded from the forthcoming `pushbullet` MELPA package: https://github.com/milkypostman/melpa/pull/1429
Merge master onto pr/6