Moved company specific settings
Merge pull request #22 from futurice-oss/cleanup

Moved company specific settings