Some changes made. Committing before I can pull.
Merge branch 'master' of https://github.com/kaisarea/loki
everyone: did hacking at today's meeting
Committing previous changes.