Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'master' of github.com:gem/oq-engine
Merge branch 'performance-report'
Merge pull request #1169 from larsbutler/rm-config-gem

Remove config.gem files from demos

[r=matley] [f=*trivial]
Cosmetic change
Merge branch 'master' of github.com:gem/oq-engine
Enlarged an INTEGER to BIGINT
Removed a check too picky on OS X
Merge pull request #1170 from gem/1177403

Fix performance_monitor_test.py on Mac OS X
bin/openquake:

Show only calc info (not "job") in bin/openquake console output.
logs:

Include calc domain (hazard|risk) and calc id, instead of job id
in log messages.
engine:

Update call to logs.init_logs_amqp_send; there's a new func signature.
utils/tasks:

Removed obsolete `get_running_job` function.
utils/tasks:

Update call to logs.init_logs_amqp_send.
supervising/supervisor:

Update log message format to include calc domain (hazard|risk)
and calc id.
tests/logs_test:

Updated broken logs tests, per code changes in the logs module.
logs:

Updated a comment.