Support i386 and /usr/local
Merge pull request #5 from dldinternet/master

Quick changes to support i386 and /usr/local