New gemfile.lock after setting up new system.
Merge branch 'master' into bootstrap_to_foundation_change

Conflicts:
	Gemfile.lock
Make form_for work better with foundation.

Uses the foundation rails helper gem to automatically add foundation style
error messages.
Load foundation javascript.
Update how paperclip works in development.

Need to be able to see thumbnails again since I am redoing html/css.
Update user login for foundation.

Also add partial to handle displaying errors.
Move artwork new/edit to foundation styles.

Also make sure show page is using decorated artwork.
Remove double labels.