Added CAS login info
Merge branch 'dev' of git://github.com/rice-apps/servery-app into dev