initial change setup
set up screenshots with phantomjs and paperclip
keep screenshots out of version control
set up initial view with screenshots
update gitignore to exclude screenshot directory
fix merge errors