remove conflict file
remove console warning
Added PushBullet notification support
Create init.upstart

Created an Upstart job.
Update init.upstart
Update init.upstart
More descriptive api key label
Allow for albums with no AlbumTitle or ArtistName

If an album is in the db with incomplete information allow the page to be accessible so it can be deleted.
Fix infinite sleep, duplicate torrent fix

If a duplicate torrent is added return proper information.
When retrieving the folder name only try 10 times
Do not search for albums missing information
bugfix

Since we wont infinitely wait for the torrent folder to be created. Log an error if it can't be determined.
Fixes #903
Stop album being deleted and re-inserted as wanted on refresh if status set
Merge remote-tracking branch 'maiis/master' into develop
Merge remote-tracking branch 'CameronNemo/master' into develop
Merge remote-tracking branch 'opcon/pushbullet_api' into develop
Merge conflicts
Merge remote-tracking branch 'jerbob92/master' into develop
Merge remote-tracking branch 'AdeHub/bugfix7' into develop