Merge pull request #6 from dclarizio/master

Dan's first commit
Dan's second commit to application_helper