added Makefile to install both projects
changed settings so that it is easier to factor have
different settings for production and development