Merge pull request #1 from niccholaspage/master

Merge PR for SOME features. Edit will come later.
Re-add bit.ly url shortener
Fix more errors caused by the PR
Fix fasands of errors from dodgy PR code
Saved another class from the menace of the PR
Fixing more errors caused by PR...
tip: NEVER TRUST a dodgy PR. This is shockingly full of errors
Honestly not sure if I got all the idiots errors
Time for a thorough test to see if I squashed all the PRs Bugs
Found more bugs
Remove ILLEGAL UNREQUESTED Leave-item-door badly made feature
Removing any more traces of that horrible PR and it's trail of error
bugs
Removing traces of PR
Removing traces of that dodgy PR
Merge remote-tracking branch 'upstream/master'