Merge pull request #9 from mpaciore/cleanup_and_fixes

Cleanup and fixes
Merge pull request #10 from mpaciore/cleanup_and_fixes

fixed infrastructure adding
Merge pull request #11 from mpaciore/cleanup_and_fixes

Cleanup and fixes
Stub: reverting SSL certificate loading
Draft: Restoring and refactoring insecure SSL and certificate load
Update README.md
Fixed some old bugs
Merge branch 'ssl' of https://github.com/mpaciore/scalarm_monitoring into ssl
Some spaces added
merged from master