Remove un-needed config.
Merge pull request #157 from Gizra/clean-config

Remove un-needed config.
Use Behat 3.0
Add debug
Merge pull request #158 from Gizra/fix-travis

Use Behat 3.0
Use default phantomjs
Setup dashboard and markers.
Wait for login page.
Minor: improve Test docs
fix(dashboad): Remove hardcode content.
Issue #160: Add logo image
Merge remote-tracking branch 'origin/master' into 141

Conflicts:
	.gitignore
	client/app/index.html
	client/app/scripts/app.js
	client/app/scripts/controllers/dashboard.js
	client/app/scripts/services/map.js
	client/app/scripts/services/meter.js
	client/app/styles/main.scss
	client/app/views/dashboard/dashboard.html
	client/app/views/dashboard/dashboard.main.html
	negawatt/modules/custom/iec/iec.info
	negawatt/modules/custom/negawatt_account/negawatt_account.info

negawatt/modules/custom/negawatt_electricity/negawatt_electricity.info
	negawatt/modules/custom/satec/satec.info