Improve proxy action alias handling

[jrbotros]

Right now it's pretty confusing, largely because the proxy actions and their aliases are in separate files. We should package actions and their proxies together, or ideally automatically create proxy actions from their aliases.