Removed machine-specific files from the repository.
Merged from remote master