Change meck repo to basho fork
Change meck dep to match that on develop
merge develop to master

Webmachine users are starting to use Erlang/OTP 17.0, which requires
changes to webmachine and its meck dependency. Merge the develop branch to
master to ensure all changes necessary for 17.0 are available there.
Merge branch 'master' of git://github.com/basho/webmachine into port-listed-in-docs
Change reference to listening port to 8080

The template used by scripts/new_webmachine.sh (wmskel) sets the listening
port to 8080 (in priv/templates/src/wmskel.app.src), not 8000 (as is
used in the demo app).