release candidate
another test
another release candidate
working release candidate
add pidlock
production
update
Merge branch '20140630' of https://github.com/guycole/mellow-elephant-py into 20140630
Merge branch '20140630'

Conflicts:
	.idea/workspace.xml