wait for the app to actually listen before calling address()
Fix some json syntax error
Added support for custom headers per method.
Merge pull request #56 from MarceloEmmerich/master

Custom headers per method
Merge pull request #46 from allenhuang/master

Fix some json syntax error
Replaced fs.readFile with require for JSON files

As  of node v0.5.x we can require a .json file
the same way we do it for .js files.
http://nodejs.org/api/modules.html#modules_file_modules
Merge pull request #72 from jaipandya/patch-1

Replaced `fs.readFile` with `require` for json config files
Merge pull request #44 from lornajane/listen

wait for the app to actually listen before calling address()
Merge branch 'master' of https://github.com/mashery/iodocs into mashery-master

Conflicts:
	app.js
Merge branch 'master' into wh-updated

Conflicts:
	app.js
	public/data/apiconfig.json
Incorrectly removed 'content' and 'contentType' variables, undoing that. Using 'require' instead of 'JSON.parse(fs.readFileSync())' in 'processApiIncludes()'.
Merge branch 'wh-updated' into whitehat-schema;
Updating with changes made in Mashery-Master.