[18] Housekeeping

Trello: https://trello.com/c/xm3EGH0L

---

Rather than have the feature branches explode into 100 line diffs with lots of "refactor" commits interspersed within them, it would be better to take care of that separately.

This branch makes the following changes:

* Removes a bunch of dead code which is either redundant or not called anywhere inside the app.
* Cleans up some trailing whitespace and tabs which should be spaces
* Removes some in-line comments (since in-line comments are generally evil).

There are also some small fixes:

* Error handling when communicating with Searchify. At the moment this is quite stupid - it just returns an empty list of results.