Couple of bugfixes and ehnancements.
Removed useless dependency
Getting ready for deployment on CF stack (Bluemix)
Added custom settings using env vars.
Working settings