Merge remote branches 'jn/cosmetics', 'jn/doxygen' and 'jn/renames'

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/command.c
Simple merge

diff --cc src/list_window.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/mpdclient.c
Simple merge

diff --cc src/ncmpc.h
Simple merge

diff --cc src/player_command.c
Simple merge

diff --cc src/screen.c
Simple merge

diff --cc src/screen_artist.c
Simple merge

diff --cc src/screen_browser.c
Simple merge

diff --cc src/screen_file.c
Simple merge

diff --cc src/screen_keydef.c
Simple merge

diff --cc src/screen_lyrics.c
Simple merge

diff --cc src/screen_outputs.c
Simple merge

diff --cc src/screen_search.c
Simple merge

diff --cc src/screen_song.c
Simple merge