added type matchers
removed expand_path helper
added my IP and SSH key matchers