adding archive scaffold, updating to rails 4
removing simple_form, updating archives controller/views
updates
fixed by updating friendly_id
working on adding devise and rails admin
updating user model migrations, bumped ruby version
adding devise stuff
sync
added markdown rendering to the archive page view
Merge branch 'rails4upgrade' of github.com:IconoclastLabs/MotionMeetup into rails4upgrade

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
	db/migrate/20130405015637_create_users.rb
updates
updates to the admin pages
working on adding graphical assets to archives
working on frontpage archive display
adding S3 config points
trying to add paper_trail versioning
backing out paper_trails due to rails4 issues
saving asset addition progress
fixing the model for paperclip
added migration