FIx template so that items aren't shown if data isn't there (eg. name or source)
Unit tests, fixes and refactoring
- Unit tests for recently committed code
- Some fixes that the unit tests brought up
- Refactoring to make some methods testable, and to improve general code standards
Merge branch 'master' of github.com:joindin/joindin-web2 into comments-fix

Removed some tests and code refactor, to do at a later date. We'll need to refactor it in another way
Merge branch 'master' of github.com:joindin/joindin-web2 into comments-fix
still need the verbose URI as the source is there