Make minor correction to readme.
Update ignore file.
Add parens to name combination.
Clarify documentation on `combined_with` method.
Add distance_from method to Technology class.
Merge branch 'master' into tests
Switch to unittest and add Technology tests.