merchant model cleanup
user model cleanup
merchants controller cleanup
session controller cleanup
session controller cleanup
ignore DS_Store, thanks for NOTHING, Apple
analytics placeholder