Fauxton: fixes after the merge

- Fauxton: Fix database view after the merge
- Fauxton: Change Couch port to 15984

@rnewson: will the port change back to 5984 in the post merge tasks?