[#54] python2 compatibility
Merge branch 'master' of github.com:Nozdi/shmir into iss54

Conflicts:
	shmir_api/src/shmir_api/settings.py
[#54] base salt config
[#54] vagrantfile, puppel config (epel, supervisor)
vagrant with centos & py27
working centos with epel, py27, setuptools, postgresql
removing waste files
Merge pull request #56 from nihilifer/iss54

Iss54