Merge branch 'master' into slave_placement

Conflicts:
	SingularityService/src/main/java/com/hubspot/singularity/config/SingularityConfiguration.java
enhanced readme
Merge pull request #232 from HubSpot/slave_placement

support for slave placement
more cleanup
Merge branch 'master' into hs_staging