Merged in rw_grim/pidgin-nest (pull request #18)

Add some shortcuts and clean up some stuff