Smugmug merging
Merged with errors
Merge branch 'smugmug' of github.com:kandluis/crimsonstore into smugmug