Merge pull request #352 from dorkster/joystick

Allow defining default names for portraits