Updating settings model
validation working on portfolio entry
resolved merge conflict
Merge pull request #13 from rathbun-kennewick-costanzo/patrick

Patrick
added parsley to signup
Merge pull request #14 from rathbun-kennewick-costanzo/patrick

added parsley to signup
Merge pull request #15 from rathbun-kennewick-costanzo/jesse-dev

added client side templates and rendering for portfolio collection