alphabetize admin location screens
travis configuration
Merge branch 'enhancements'