Update README
Updated build instructions
Merge branch 'master' into readme

Conflicts:
	README.md
Merge pull request #11 from hiddentao/readme

Update build instructions, especially for OS X