Merge changes to move to knockoutjs