Moved Bash script & conf file back into master