Latest from my client.
Merge branch 'master' of github.com:neosavvy/ng-conf-hack