cleaned up
Merge branch 'menu'

merged menu and master

Conflicts:
	aster-mode.el
added shortcut
squished bug and changed order of entries