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
Made endpoints and methods into links. Opening an endpoint or method link in a new tab will expand said enpoint/method upon page load.
Adding type-ahead search functionality. A bit buggy, but works for the most part.
API config files may now be split into parts, parts can be pulled in using the '{external:{href:...}}' syntax.
Showing options for content body.
Data entered in content parameters will show up in text area as formatted content body.
For collection and list types, can now add additional elements; collections can be minimized; text area made bigger for easier viewing.
Adding in @dgc-wh's code to send content in requests for which content has been given. 'content' has replaced 'requestBody' in this commit.
Merge branch 'feature/bookmarks' into integration
Merge branch 'feature/search' into integration

Conflicts:
	public/stylesheets/style.css
	views/layout.jade

Accepting changes from both branches, they do not interfere with one another.
Merge branch 'feature/split_configuration_files' into integration

Conflicts:
	app.js

Moved search feature code so that it is after split configuration code.
Merge branch 'dev/content-parameters' into integration

Conflicts:
	public/stylesheets/style.css
	views/layout.jade

Kept changes from both branches.