Merge with master, add more error checking to logins
Remove files that have been moved/deleted