Added some configurations
Merge branch 'master' of github.com:alem0lars/configs