Merge pull request #2 from tiy-durham-june2014-frontend/mason-branch

Mason branch
updated license
fixed merge conflicts
getJSON fiddling and put dist in gitignore file
merged amy and master
added fake data to get templates functional
committing changes to allow deploy
merged gh-pages
updating for deploy
merging in changes saved to gh-pages
fixed image
resolved merge conflicts
reduce to one model and wrote code to construct url for api endpoint
merging amy into master
simplified model, added baseURL and constructor to collections, cleared errors
merged amy
fixed bugs
more merge conflicts
more bugs
more bugs