Ignore the config.php
Merge branch 'master' of github.com:jamesread/upsilon
Merge branch 'master' of github.com:jamesread/upsilon
Merge branch 'master' of github.com:jamesread/upsilon
Merge branch 'master' of github.com:jamesread/upsilon
Merge branch 'master' of github.com:jamesread/upsilon