converted to testling
Merge branch 'master' of github.com:ampersandjs/ampersand-view