Removes merge artefacts

This pull request removes some left-over artefacts from a recent merge. I found this as I was trying to follow the install instructions. While testing the updated code I observed that the popup remained indefinitely. I have added a function that results in the popup notification being cleared after the time-out time. 

Tested on Ubuntu 13.10 using Chrome Version 32.0.1700.102.