Update README file, mention prequisites
Merge remote-tracking branch 'origin/master'
Fix makefile to not assume it is running on my dev box