committing more progress
Merge branch 'mw2014' of https://github.com/IMAmuseum/tap-web-app into mw2014
Merge branch 'mw2014' of https://github.com/IMAmuseum/tap-web-app into mw2014
Merge branch 'mw2014' of https://github.com/IMAmuseum/tap-web-app into mw2014
another big everything commit merry christmas
more of the same