Context menu is now sane

Signed-off-by: Byron Maroney <bmaroney@ualberta.ca>
Context menu is sane

Signed-off-by: Byron Maroney <bmaroney@ualberta.ca>
Merged local branches

Signed-off-by: Byron Maroney <bmaroney@ualberta.ca>