now with context
Merge pull request #1 from Shoat/master

Makefiles, run.sh, gitignore stuff