Using uname -m if uname -i returns unknown
Merge pull request #1 from stbutler11/master

Compiling on x86_64 RHEL