Minor fixes
Merge branch 'bugfix' into dev

Conflicts:
	adiumsh/adiumsh.py
Removed _set_as