Merge remote-tracking branch 'origin/master'
Bumped version number to 0.2.2-alpha.
Bumped version
WTF, I hope this works...
Merge remote-tracking branch 'upstream/master' into develop
relies on agilegeo now that wavelets and reflection have been ported over