Cleaned up sample properties files to be consistent with new instructions on wiki.
Updated README