Update property_parser

Fix indentation
Update property_parser_tester

tabbed to 4 spaces
Conflict resolution

Conflicts:
	property_parser.py
	property_parser_tester.py

Using 4 spaces for tabs to conform to standard
Update property_parser & utils

Fixed keyword, and visiblility
Update property_parser_tester

Create a list of strings vs. list of TextIOWrappers