Backport fix/cleanups from RGIMS
Merge branch 'master' of git://github.com/nursix/eden
Deploy: Identify HR (Parser: Centralise this fn)