Merge branch 'master' of https://github.com/stv0g/yosys into stv0g-master

diff --cc Makefile
Simple merge

diff --cc README.md
index 3d3ff422e6041034280cd02ebc207fd671965504,79abad629e039d32641652e4539dd938a168e294..7c4dbf0c531e663e01e5c4ad8166f402776ffa8a
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -46,8 -45,9 +45,9 @@@ Setu
  
  You need a C++ compiler with C++11 support (up-to-date CLANG or GCC is
  recommended) and some standard tools such as GNU Flex, GNU Bison, and GNU Make.
 -TCL, readline and libffi are optional (see ENABLE_* settings in Makefile).
 +TCL, readline and libffi are optional (see ``ENABLE_*`` settings in Makefile).
  Xdot (graphviz) is used by the ``show`` command in yosys to display schematics.
+ 
  For example on Ubuntu Linux 16.04 LTS the following commands will install all
  prerequisites for building yosys: