Overall update to our new standards.
Merge branch 'master' of https://github.com/theysconator/angavanda