fixed documentation to reflect res. conf. changes -- still needs work
fixed #174
Merge branch 'master' into devel