Merge develop into master, ready for 0.1a

All issues blocking Version 0.1a have been resolved.