Upload wizard

Reworked upload process - controller was getting out of hand and buggy.
Now using wicked gem to manage steps of this process.  Also cleaned up views.