getting boulder kinks worked out after big merge from development
quick commit 2014-11-25 14:06:04