update makefile
update dockerfile
using buildout 2.x
removed unused master variable
cleaned up buildout.cfg, ipython added
fixed pywps config
malleefowl added to conda deps
release 0.1.2
Merge branch 'develop' of github.com:bird-house/emu into develop
Merge branch 'develop'