Merge pull request #7 from LAS-IT/master

Merge master to develop due to hotfixes
Check for new keywords on new OD
Switched to non-english logical operators
Needed parenthises
Adde rbenv-vars for ldap
Use rbenv-vars for database configuration
Removed sinqle quotes around password
Parents query student travel requests via the student username without the '-'
Added mailer configuration
Using rbenv-vars for airbrake api key
No need to use erb syntax for accessing ENV values from within .rb files
Ignore deleted travel requests when looking for overlapping requests
Merge pull request #8 from LAS-IT/develop

Develop