Minor fix regarding password resets
more ACP work
Merge branch 'v2.0' of github.com:calzoneman/sync into v2.0
Add another nesting layer (#174)