build and push to staging
maps work
removing local conflicted files (dropbox sync issues?)
add getDeviceType global function

This function will return
“desktop”, “tablet” or “mobile” based on current device
update maps script to target device type instead of screen width
JS / coffeescript fix for short course filters
add 92.5% max-width for desktop
blocks - padding left and right
build for github
amend fix for two-ups in media blocks
maps and blocks scss styling
fix conflicts after pull from origin/master