updated configuration
updated master to be Intellij 14 compatible