Rewrite config.ml to use the new combinator API
Remove unused .conf file
Use the latest mirage-tool update

Call the FAT shell wrapper in config.ml instead of copy/pasting the same shell script everywhere.
Add ACM Queue article
add nymote ann to links page
Fixing the LWT tutorial code to conform to the latest release of Mirage.
Merge branch 'master' of github.com:mirage/mirage-www
Add FOSDEM interview link
repair travis
pin ipaddr for the moment
fix ipaddr version
Merge pull request #86 from avsm/master

Add ACM Queue article
Merge branch 'nymote-ann' of git://github.com/amirmc/mirage-www

Conflicts:
	src/data.ml
Merge pull request #91 from avsm/master

fix #87
Merge pull request #89 from mor1/master

fix broken permalink
Merge pull request #88 from gabemc/master

Fixing the LWT tutorial code to conform to the latest release of Mirage.
Add a minified Foundation JS
Merge pull request #92 from avsm/master

Add a minified Foundation JS
Merge branch 'master' of git://github.com/mirage/mirage-www into combinators
Update config.ml