Fix: test test_acknowledge_with_expire
Merge pull request #1081 from zacbri/master

Added CLI option to pass the path to shinken.ini as parameter.
Update config.py

Fix : Variable name overlapping.
Add: Changelog update for 2.0 RC
Add: go to 2.0-RC
Merge branch 'master' of github.com:naparuba/shinken
Fix: some tests, and put all tests into quick_tests.sh
Fix: Aina Rakotoson is a man, sorry.