removed unused code
machines are loaded automatically if "machine" parameter is used
Merge branch 'develop' of github.com:bendisposto/prob2 into develop