adding Controller.replace back in w/ tests!
Merge branch 'master' into gh-pages
version bump for controller.replace