bring back p4merge
add ack vim plugin
add json formatting
install tweak